Add a getter for the the sealed context_id field.

2008-09-29  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtk.symbols:
        * gtk/gtkimmulticontext.[hc] (gtk_im_multicontext_get_context_id):
        Add a getter for the the sealed context_id field.

svn path=/trunk/; revision=21546

diff --git a/ChangeLog b/ChangeLog
index f0a981019e3aebd447e3672c11a410aed7255420..7f5874c4106a5883dd278ce8e8f8b9589e4c659f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtkimmulticontext.[hc] (gtk_im_multicontext_get_context_id): 
+       Add a getter for the the sealed context_id field.
+
 2008-09-29  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 107000 – Add signals to GdkKeymap for monitoring caps_lock, etc.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2ce71413a65f37826e67cf47c11b764a77c2d58b..4b401ef16f1df0e37ed3397be1836669e2f94655 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk-sections.txt: Add gtk_im_multi_context_get_context_id.
+       
 2008-09-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdk-sections.txt: Add gdk_keymap_get_caps_locks_state.

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 8c854ee201a3a3ecb3671696dba1eaba18fff177..90980ce1874e33fa152c47979e83200e083bce26 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2029,6 +2029,7 @@ gtk_im_context_simple_get_type
 GtkIMMulticontext
 gtk_im_multicontext_new
 gtk_im_multicontext_append_menuitems
+gtk_im_multicontext_get_context_id
 <SUBSECTION Standard>
 GTK_IM_MULTICONTEXT
 GTK_IS_IM_MULTICONTEXT

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 1d68fec073b280199c2a180a1c4006dd5fa22533..ebe20d4b8e91f770c2b1479cda8365ff8456b3a2 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2019,6 +2019,7 @@ gtk_im_context_simple_new
 #if IN_HEADER(__GTK_IM_MULTICONTEXT_H__)
 #if IN_FILE(__GTK_IM_MULTICONTEXT_C__)
 gtk_im_multicontext_append_menuitems
+gtk_im_multicontext_get_context_id
 gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
 #endif

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index f33a6cc7506074776251a318f14cd569d5f2cb33..70820a942a2cebd27e31348edc8108d65ea342b4 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -524,7 +524,7 @@ pathnamecmp (const char *a,
 
 /**
  * gtk_im_multicontext_append_menuitems:
- * @context: a #GtkIMMultiContext
+ * @context: a #GtkIMMulticontext
  * @menushell: a #GtkMenuShell
  * 
  * Add menuitems for various available input methods to a menu;
@@ -628,5 +628,22 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
   g_free (contexts);
 }
 
+/**
+ * gtk_im_multicontext_get_context_id:
+ * @context: a #GtkIMMulticontext
+ *
+ * Gets the id of the currently active slave of the @context.
+ *
+ * Returns: the id of the currently active slave
+ *
+ * Since: 2.16
+ */
+const char *
+gtk_im_multicontext_get_context_id (GtkIMMulticontext *context)
+{
+  return context->context_id;
+}
+
+
 #define __GTK_IM_MULTICONTEXT_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index f02bd30db44038f61bd334b0be9c5e8f9b00a6c1..9e444cb00a35b1011310198e845927da9f5c5faa 100644 (file)
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -68,6 +68,8 @@ GtkIMContext *gtk_im_multicontext_new      (void);
 
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
                                                    GtkMenuShell      *menushell);
+const char  * gtk_im_multicontext_get_context_id   (GtkIMMulticontext *context);
+
 
 G_END_DECLS